]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
dash: Construct the label at init
authorJasper St. Pierre <jstpierre@mecheye.net>
Wed, 3 Oct 2012 05:19:36 +0000 (02:19 -0300)
committerJasper St. Pierre <jstpierre@mecheye.net>
Sat, 6 Oct 2012 19:07:54 +0000 (16:07 -0300)
Nothing doesn't use a label, so it doesn't make sense to
lazily initialize it.

https://bugzilla.gnome.org/show_bug.cgi?id=685313

js/ui/dash.js

index 427802ac0f57b4abe393d74b67667f936c655e31..53894a71b0e1fef77cc4ddc40e0a603c28bbbafc 100644 (file)
@@ -48,7 +48,9 @@ const DashItemContainer = new Lang.Class({
                            Lang.bind(this, this._allocate));
         this.actor._delegate = this;
 
-        this.label = null;
+        this.label = new St.Label({ style_class: 'dash-label'});
+        this.label.hide();
+        Main.layoutManager.addChrome(this.label);
 
         this.child = null;
         this._childScale = 1;
@@ -103,9 +105,6 @@ const DashItemContainer = new Lang.Class({
     },
 
     showLabel: function() {
-        if (this.label == null)
-            return;
-
         this.label.opacity = 0;
         this.label.show();
 
@@ -136,19 +135,10 @@ const DashItemContainer = new Lang.Class({
     },
 
     setLabelText: function(text) {
-        if (this.label == null) {
-            this.label = new St.Label({ style_class: 'dash-label'});
-            Main.layoutManager.addChrome(this.label);
-            this.label.hide();
-        }
-
         this.label.set_text(text);
     },
 
     hideLabel: function () {
-        if (this.label == null)
-            return;
-
         Tweener.addTween(this.label,
                          { opacity: 0,
                            time: DASH_ITEM_LABEL_HIDE_TIME,